bz1113848 - Reverting changes of 1003459 and making GUI results compatib...