Revert 555ceea..e862416

This rolls back to commit 555ceead375b963237d9b9a489bc6d38386e6d59.