Revert 63f99d8..57aee44

This rolls back to commit 63f99d81f4f1d5df81006e098437159ddce08f51.