Oh hm, I didn't realize this was the behavior in master already. I don't think I recall us making that change and I'm not sure we should keep it (the choice should be up to the skin). But it's fine to leave in this PR.