Should have been part of r9663: do use the platform-independent version