Reduced to voodoo. Undoing api change, as that was last major code change since last successful test.