Revert b0d3820..e2c2d19

This rolls back to commit b0d38205f2c2bc9af8ca1a6a2d81e7df019288b7.