If there are boolean conditions in the env marker, the existing join causes the extra tag to only be applied to the first of them, causing carnage. Change-Id: I7b735befae76b330f923276e1c48ef23816774d4