Revert "SAK-1 migrate code"

This reverts commit 80377c0cc5d76e3920e13b284fbd908c6dfdca71.