Revert b95f880..278cd51

This rolls back to commit b95f880805d3aee32409521b74ebf49ecf8e41b0.