Revert commit 7742bba482e514f5abcec066c6336dbd00ecd916.