Revert 0c0294e..50573e7

This rolls back to commit 0c0294ecf6fb56c7aa749091639cb2db436b1748.