Revert r152209

Revert another fixup patch for one of the commits we reverted in our branch.

Change-Id: I423969481d398df7f334ba4fbf2f2e466ff418fb
Reviewed-by: Julien Brianceau <jbriance@cisco.com>
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>