Revert e06fe14..701fd1d

This rolls back to commit e06fe14c3b53f0334b0cf97a5b42479a36708c31.