Revert commit "0551284dc08eb93ef7b2b2227a45e5ec21d482fb" - simplify