Revert #1937

We can now get rid of label key as we replaced it with id.