Dont add kafka metadata by default
Closes #1691