Revert "Mount Tweaks"

This reverts commit 055ef380a235d3349aeb1f4133cc40432556de17.