Revert "Temporary remove Zack,s changes, need this for testing"

This reverts commit 41b00f3c3e79df178ae1d0943ff4faf2407ba5c3.