Revert 40782eb..6146098

This rolls back to commit 40782ebe1de3588b8157391456eca3bff12bb4f5.