Revert "Katana GA Update"

This reverts commit 31779e00aff39eda58e07378c2c76be59c520a21.