Revert "c9fix"

This reverts commit a112d5e5ae135bd0a7500ab45d0d5a5f176a3885.