Revert 1086418..c0fe06f

This rolls back to commit 1086418586358097fd1720bb427d44e345931f7b.