Revert "z1 edit"

This reverts commit 28e8c107fd02af7a5a92455e6e93d236fc12f064.