Revert 05536f8..5758f52

This rolls back to commit 05536f8fe980f3ddf680e8e6c6527e4e784b4de2.