#6615 : Revert changes to simplify code review.
Fixes #6615 : Re-adding previous changes.