Backport patch from frameworks branch because frameworks branch

was never deleted !
So I made an error.

I hope that now frameworks branch will be deleted or made read only.