Re-add code that was not meant to be removed/replaced