Reverting work done for BZ BZ 991090 because it adds a circular dependency