These changes are incompatbile as-is with 1.14 due to the Thread.sleep call, this should ideally be brought back in the future