same comment here: please revert all this but add a comment about removing these with a link to the bug you'll file