Revert regression introduced in #4104 (Fixes #4390)