Revert 2ee70d1..b7a1c3d

This rolls back to commit 2ee70d18fc48fb0ea038af2d2b4b43d09232e3f7.