Add back erroneously deleted code