Back to default for 4.2.2 instead of master