Revert 35ff438..20c8989

This rolls back to commit 35ff438b13840b7e3b520b7d7843d490ac0d2c85.