Revert "maybe this way"

This reverts commit c987639e6c43b1567c828d7494cb26d380fdd510.