Revert 84a9ee2.