Reverting work done for BZ BZ 991090 because it adds a circular dependency
(cherry picked from commit 5c2c5b0828cacfff4506ce82c9df4743f50b3ba6)