GJP-40-Fix-build-changed-back-plugin