Bring back some code that was somehow lost.