Reverted to upstream version.