Revert opdata_d changes and ArrayKey hack