Revert 3a0f84b..369e2e7

This rolls back to commit 3a0f84b588d630a5a8a28aa0ee26380a224dbb4a.