Remove unconstructive changes since the port.