Revert "cleanup: reclassify method"

This reverts commit c9639067d1b011fb2b0d9acc2477c01928546dbe.