Revert 9dcc3a6..5b897df

This rolls back to commit 9dcc3a696a2b47fb7a0dfd88317592045ce8c460.