Revert the removal of a BC relevant part.
Merge pull request #3287 from dereuromark/2.5-bc-fix

Revert the removal of a BC relevant part.