Branch 3.2.1 - Remove fix for 152725
4 files changed