Put back some code which was mistakenly removed.

Signed-off-by: Shawn Laffan <shawnlaffan@gmail.com>