Actually I'm wrong, it's the additions + user-scalable that needs to be removed and this does reintroduce the bug.