revert some of the const mess