Portability part2

Do we know why this was needed in the first place? Commit message is not very helpful.