Is there a downside to doing this on all platforms? If not, maybe we should just use this across the board and avoid the extra code path.