Unsure why this was moved into Core, but can live with that for 5.1.