Adding back some lost code.
Added lost code.