Revert changes that got removed somewhere along the line. [fixes #73699844]