partial revert of the commit 4ad186c5ef61