Revert 75f505b..46b9ea9

This rolls back to commit 75f505be24d2ea84c51a6e11523ed16f1624a13c.