Revert eef192f..b087f14

This rolls back to commit eef192fc3c98a663f99f2fd944611bce0adffc0c.