Revert "lazy - stuff ..."

This reverts commit e455e1d46317355dd32947b89d99d2b2c51053c3.