This issue is a result of spike issue #364. The conclusion of that ticket should be the purpose of this one
