Back out the changes introduced by pull request 379 as HHH-7544. See HHH-7544 for the details as to why this is getting backed out.