Revert/amend "fix a const-cast issue"