Revert "Bug: 627"

This reverts commit 2e8e671a52614978de6940919fc677625dc25def.

Change-Id: Id9d0e784597085561ca7a257e7456c4abc1fec20
Signed-off-by: Ed Warnicke <eaw@cisco.com>