Revert addr_bit_in_space and addr_byte_in_space