Revert 785f0ae..71a6bad

This rolls back to commit 785f0aec6deb81989acf05bfaca5ac5bb8d00407.