Revert changes introduced by 29b30a9a6dce41ab82a888e692af39e8fe5acc83 to prevent infinity-loop