Revert f782522..5c6c131

This rolls back to commit f782522ec7cfe87f0169cc503947b680f2fd3d44.