[#3420683] Last fix had unintended changes, cleaning it up.