My try at fixing Bug 4653; (Also reverts SVN #32420)