Revert 8d6588a..7adbf89

This rolls back to commit 8d6588aa4f51c9945a125e1a60703421468461b1.