Brought back resources that should not have been removed in previous commit.