Revert dd707f8..c9858eb

This rolls back to commit dd707f820ef58e6772e2d605607818aede1a4a6a.