2.4.x - 2.4.1 bugfix for adding feeds

Used a function that didn't do what I thought (it used?) to do. No we don't. Added some major patch code from 3.0 revolving around adding feeds to make this a more complete bugfix.