Revert "possible z-order solution"

This reverts commit fa48c4bb1ddff21dab4690f5ec22e0ed397a6fb9.