Add back code that was removed earlier