Fix: Feeds #6032

Please correct the indenting in the new code and remove the commented out code.