Revert "Went back to old way"

This reverts commit caaa050d73085915ea942ce1b8c02dc3c835e333.
Revert "Revert "Went back to old way""

This reverts commit 8fa723e9fb77ece4e47e29800403deaa700df5a9.