Revert 9c18551..087cf36

This rolls back to commit 9c18551de7aeb4f3c1c0b9b9369180783944d7c8.