Revert "Simplify code to reuse ContentPlanner.needs_api"

This reverts commit 24077aab39a551a85adcf303f28ece24eefca0be.