Revert 5d17b24..3f709ce

This rolls back to commit 5d17b24e4e0f732824e652ad3ea114d75a371e12.
adding scopes in zombie