Revert e9fc6ab..7423b76

This rolls back to commit e9fc6ab520990c5538aa4de74c924012e28cc35f.