switch back to ifndefs