revert no-longer-required workaround for mystery bug, close #3396

Whatever it was, it is no longer a problem here.