Revert "zv9 kernel sync part 2 of 2"

This reverts commit f60cb5eda4627d462837078fd9aa8385d5538bbe.