Revert merge with upstream master