Revert e21b5d0..890c6df

This rolls back to commit e21b5d0a6899446d8e82b81df824f32c0e872d93.