It seems logical to me to make this modification following the commit 4beb1613. A control is necessary. MFC for stable-13 can be considered afterwards.
Thanks.