Small revert from opensource update