Revert last commit. It was supposed to only be on 6.x-fulltest branch.