Revert "handling"

This reverts commit 6f3c20131993c43f25e0c9ab17c0d5edaaebf4e4.