Merge "Revert "Reland "Remove gBn/sConstructorMap."""