Add back the #if directives