b0930263e5
This reverts commit e5b6537315ce9b2688ee0269ba0828a703c3e2c9. The regressions (SWDEV-459556 and SWDEV-460260) caused by the original patch has been resolved. Change-Id: I32344492b4ff88bd7e91ea47983ac15636dc77c1