Didn't actually want to commit the latter ui-scale related change, but rebasing is too annoying, so revert.