made workaroundForBug906550 permanent