Re: [sr-dev] Revert d0617167f0aebcaf1e12e6c7f77b2231aed9da51 as it breaks 4.2