Revert "Restored the old way"

This reverts commit 0122de9f6f902911b3ae33f7fe9c19e4a666fa32.