Fix for old Erlangs.
Merge bug25603 (again)