Revert 3d795ce..0e8abf2

This rolls back to commit 3d795cecd4e16bc0d0f8979ab09f391d37906584.