Revert 4762153..9875a4b

This rolls back to commit 47621537823f19cf09b9c28e03f5028601a7bc39.