Removed dependency on tag for build (again)