v32: mainly revert changes from v31 as it's needed for some ROMs