This reverts commit ad83979e5986fa3bb0d254c2be9482c12a8743b9. Downgrading to 2.28.1, 2.29 is too buggy.