Revert 095ef03..11b6c61

This rolls back to commit 095ef035e9bc32dc0f001393fa1ae8cc071be1d5.