3cf2c41738
This reverts commit e24f687606d25424bfd09dd53c7195e6d180a069. The commit in question has a bug that results in the code not compiling. Reverting to avoid breaking tonight's build. Signed-off-by: Chris Friesen <chris.friesen@windriver.com> Change-Id: I0d0ce0a096cdc5c6bceac39297da391d46a09d8d