Revert 00ee5b2..3b372f6

This rolls back to commit 00ee5b209580db2e32b55901116cf599b44c7176.