Revert to vanilla mounting behavior, fixes #7