Adapted to use the new decorator for on/off interception.