code changes as per http://bamboo1.metrics.scl3.mozilla.com:8060/cru/CR-3