Not fixed after all, change caused test failures