Issue #4863, removing remaining bits
2 files changed