Revert to the old code for the sequential case to maintain backward compatibility. Adjust testcases.