Corrects a backporting error. Tested working on production servers.