Revert "Try these const changes."

This reverts commit 3f027c1eb7c408dbb0318933d0298911213f3842.