FIXME: #4905 – mark what needs to be changed after it's fixed.