Revert c10e7a0..956c02a

This rolls back to commit c10e7a0ac1c4d84c4badb9260e417b7a11c88208.