The so-called "trivial implementation" has been with us for a few years now. It's probably safe to assume it works.. so remove the #if stuff