Fix #9360 regression in content_for
Merge pull request #9366 from killthekitten/fix-content_for-regression

Fix for #9360 content_for regression