[sr-dev] git:master: Revert 008c92bece290aed3b8e6439be71c2c37526901d