[PATCH 4.9 0/2] Allow builds and script usage on current systems