Revert "Chalice Fix"

This reverts commit 0aa7ea1b2917c67026804cc37f1186cfe0fd32b5.