Fix regression with removal of content_id

Regression caused by following commit:

commit e6ac2d09e4983a0e5f792d73d3b9355874e3defc
Author: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>
Date:   Wed Apr 2 20:47:44 2014 +0200

    Remove unneeded content_id arguments for content components

Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com>