[bugfix] remove boundaryId iff experimental grid extensions are disabled

Commit 35396cdc73caa5611d295021c27489462524e9bc actually removed the
boundaryId if experimental grid extensions we enabled, not if they were
disabled. This patch fixes this.