Fix: Feeds #6032

Please remove the commented out code.