on port-i386 by Kailash Sethuraman, with whitespace fix by me. Fixes PR#25760 - Approved by jmcneill.