Restore the removed code

- Restore the removed code.