revert changes which have been fixed upstream