Revert 0b38a80..ad226e1

This rolls back to commit 0b38a804f5e79ee129da78ea9083c584a0588260.