Revert ca1538c..8834e0e

This rolls back to commit ca1538cca7747b17576024ad1f64cccbd2d4a8fb.
?