Revert 698eddb..beb0df1

This rolls back to commit 698eddbc9d7acbccf412e2423c11bd2add13eff0.