Revert "Trying to make it work"

This reverts commit a47720e3a7f02b60dc133f6d18afc40bec0619f9.
attempt3