Revert previous commit

Change-Id: I890c9d8be757235930b32fa2b756de783acf26d1
Signed-off-by: Paul Belanger <paul.belanger@polybeacon.com>