Removed unnecessary overhead of a Handler.