Didn't we decide to put all such glitches into separate file and include it from everywhere?