Minor reversions for the sake of portability.