Issue #3380691 by seanB, danthorne, Kleve, ricovandevin, yustinTR, kthull, scott_euser: Issue 2919092 breaks BC and causes issues for existing sites