Revert "MountService: Fix build && applied few changes"

This reverts commit 716943785dab9ca3363f3364d674a47bea041c15.