Reverted some changes made to upstream