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