Revert #4195 (#4201)

Fixes #4196
1 file changed