Revert 3587364b70