Revert 9270b48..eebd256

This rolls back to commit 9270b48970a44c854be5aa9f2fe43df4362f51d9.