Revert "merged branch armetiz/master (PR #8045)"

This reverts commit a6dd5db60d1eb56be917fcc38244bcca168740a9, reversing
changes made to da6f190a6b630d6fc17729e04061308e573b47c7.