Restore the code to previous implementation in header file.