Revert 2a023ba..8ca31e0

This rolls back to commit 2a023ba2ee86cd48f81b54d145a61b9fe79d2a47.