Revert 3c0223f..f3d77fa

This rolls back to commit 3c0223f3f70d0a0494d6875622921f52350d1e0e.