Copied modification from prod.