Revert 6bc57db..4d0d1db

This rolls back to commit 6bc57db501d8d2672196d013dcdbc89a2df7b80c.