Revert "Merge "Fix FAB-578" into v0.6"
This reverts commit 562a35fd, reversing changes made to 4a78b412. This was done because we inadvertently merged a good chunk of master when patch a96b9edc was submitted to the v0.6 branch. We will cherry-pick a96b9edc in a later patch to restore the fix in the proper way. Change-Id: Ib16c0220e65697a68a5140960b82780c175d9fa2 Signed-off-by: Greg Haskins <email@example.com>