Revert "Merge branch 'nightlies-4.3-JWR' of https://github.com/labodj/mako-linaro into f96p-JWR"

This reverts commit 05d3649e558996faf5b8f033325afbe04c2b1bf4, reversing
changes made to bdfb62e709e5af069d99adb73ec8c15438b6b9fd.