Revert temp fix of perf build and weston bbappend