Revert e9963e8..b3d67e2

This rolls back to commit e9963e83dd8e99025f096a1671b9a4171301a242.