Remove mount-check hack