Move back to platform v17