Revert the previous commit 1.422 for now