This basically does what 2c905207 did for mount units Fixes: #16161 (cherry picked from commit ad172d19)
mentioned in commit 27037969
mentioned in commit 8a20311c