Patch fail. Added a couple lines that were accidentally dropped from 07cab48.