Roll back (partially) my previous check in.

Turns out my previous check in (the one which removed
"unnecessary code"), removed code which should not
be removed. This change brings this code back.

CR:JoshG.