Revert "Eliminate pointless '#if 1' statements without matching '#else'."