Revert 7180f76..4d8ceb3

This rolls back to commit 7180f76713fcb6a169547e7e3cd77dddbd25f0fd.