[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0

"Merge remote-tracking branch 'dhruvgoel92/ticket/11271' into develop-olympus"

This reverts commit e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0, reversing
changes made to 214f515e9ccc71e368882384fb38bd7135b0e40f.

PHPBB3-12413
[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

Merge branch 'ticket/12413' into ticket/12413-ascraeus

* ticket/12413:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0

Conflicts:
	phpBB/feed.php

The reverting is not done for develop-ascraeus and above.
We want to fix it properly there instead.

PHPBB3-12413
Merge pull request #2341 from nickvergessen/ticket/12413

[ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

* nickvergessen/ticket/12413:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
Merge pull request #2342 from nickvergessen/ticket/12413-ascraeus

[ticket/12413-ascraeus] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0 in olympus

* nickvergessen/ticket/12413-ascraeus:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0
Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
Merge branch 'develop-ascraeus' into develop

* develop-ascraeus:
  [ticket/12413] Revert e65a6dd8f45d0ce4c8700fb68c19ac6268162aa0