Revert 4bd1f27..c801899

This rolls back to commit 4bd1f270386398af1a6c899cf7b9ea7a75587abe.