Fixed merge conflict due to previous manual patch to prod.