Revert 117d6b8.