Revert f82c2ed..4bd98b1

This rolls back to commit f82c2ed5911d42dcd69f8217fd9c5c239943911a.