revert part of r9591 (fixes issue 2754)