Revert c2d06b7..707304d

This rolls back to commit c2d06b7159581ec22d9acceeb699f1553769e5f0.