Fair enough. We should probably make this change in master too