I reverted both a1f49cc179ce and 7c83d7abc999, the hardware cursor is back working. Obviously 7c83d7abc999 is wrong, and a1f49cc179ce is doubling it.