last build script fix; & reverted previous fix