Revert e0c318c..ef3ba8f

This rolls back to commit e0c318c256c3390722c61d764fd473fb57fc0a2c.