Changed my mind about deprecating this [skip ci]