Fixes #6126. No idea why this was commented out.