Just use the generic nullmountpoint edit in here

(cherry picked from commit a3f9894d7fe03bf1c34b8c51e944defe0286942d)