Port ColdFusion 11 workaround from 2.2.1 to 2.5 snapshot.