This can't be resolved until EC / EP switch around... The SP relies on state information that is only present in EP at the moment.