revert SP implem change