Fix #9360 regression in content_for