Fixes #2643 by restoring previous behavior