Revert "Poor man's fix: add specific content type"

This reverts commit a229c321c5c41c7afdab94c56f69231f02bed437. Ah, OK. I was a bit confused why you wanted me to revert something on my branch but now I assume it's so we can moved forward with the "real" fix :-)