Recommitted to try to fix merge issue