Revert "base handler not required"

This reverts commit 46e31e9a7bd0c9436c354cd910b07782bcf7be5f.