Please revert all changes to this file. This should *definitely* not happen in this PR, and if it should happen at all it should happen in a separate PR.