This should probably also be added to the list of build tags for our official build in our Dockerfile.

Also, I think this PR might need to be rebased again.