Revert d748189..2321152

This rolls back to commit d748189443cdf1273719f32b11d511e25d5b2550.