Revert 92e4ee4..ddf9a44

This rolls back to commit 92e4ee4674cf05831d893ed81f1dffb82ac018ec.