Revert 1011865..50b7f60

This rolls back to commit 101186551c668e50ac807a6fa809e312d5a9b173.