Revert 09df7ca..e476cbd

This rolls back to commit 09df7cae0369712843cb788014e12310973d80b1.