Revert "Trying to fix this mess"

This reverts commit c564d4faf670576b2754a312532f6bb2a44d6363.
Revert "Revert "Trying to fix this mess""

This reverts commit 38239c7d6d0d661e4d01885c3367890857a38a7b.