Revert "Fixing accidental downcasing"

This reverts commit 7311ab9ea954d0a3b06fab3dbe0224dfc02ab7df.