Blacklisted (for the time being) the functions that have a component argument. Don't want to drag the Cm module into the core set too.