I don't expect this to be merged, but wanted to drop a patch here since I have many sites that may want a drop-in replacement without new modules.
Closed: works as designed
3.0
General