trying to intercept control messsages, but not working well
Revert "trying to intercept control messsages, but not working well"

This reverts commit c022be5c74356bf2d63c37516442957824a95e75.