revert workaround introduced for issue #1332 as the actual cause appears to be my incorrect fix from #1262 (see #1388)