Revert b115d29..c826300

This rolls back to commit b115d29684a1840e2007205ea8a8ae373d3227e0.