Commit work on groove mount, going back to non-groove mount