Revert "Constness where constness belongs to"

This reverts commit b98be7a14e2553ae6aaa04311af78010b9a7194f.