Revert "Don't cutoff meta-data being set!!!"

This problem should now be solved by: http://gerrit.vanir.co:8080/#/c/2106/

This reverts commit 16b0147382d01af5b51102698f75769e77303d37.