Reverted to upstream version