Revert 4058f3d..0760d69

This rolls back to commit 4058f3df66c4d0830c1b261475554cdf6ad338eb.