Revert "onEnable/Disable"

This reverts commit 861fad23a609c7d505f58b9ce2937fec50af4127.
Revert "Revert "onEnable/Disable""

This reverts commit 26d8fca515acd4330664d1416c78c7e05078d5bc.