Revert part of my cleanup attempts because 2.10 needs them.