Fixed up bug after removal of axis remapping.