Partial revert of I80a47844 for (sr)