[ci skip] 00b747a causes weird fails, rolling back