Updated to be cross-platform again.