revert 'modify z-order' commit