Revert 53442ed and 123a654. They were never needed. See #958