Revert "Temporary commit before resolving the const issue"

This reverts commit be7a2c8368cf11626a55b26e9e825129f34ec191.