Revert: "Remove common props"