Completely remove a "nullfied" ifdef rather than making the code
unreachable. Though this is only a cosmetic change it syncs the port
with base commit r347642, making it easier to compare the two when
diagnosing problems in one or the other.

This was discovered tonight while reviewing some code following my
discussion regarding an issue lwhsu@ was having earlier today.