Unreviewed attempt to fix the 32bit build after r197782.