Revert 824e071..2a85b9a

This rolls back to commit 824e0717f5fa90410e6b8a878651d510260899a7.