Revert "Bad change for Cody"

This reverts commit 8a12536187c628853c78e98b1d30f7ceeeea1b77.