This reverts commit da42d110, problem is fixed now with fc56579e "Keep GCC 4.6 happy" Conflicts: postprocess/qa/services.cxx Change-Id: If819749d322a0887c1668fbbe563d14e0402ac78