Revert commits ca764f6680 and 2fc3693464