This basically does what 2c905207 did for mount units Fixes: #16161
mentioned in commit 7f035c54
mentioned in commit 27037969
mentioned in commit 8a20311c