Revert "Quick legacy handler fix"

This reverts commit 426ee39a263cc04ae055ad0e53fd9bca935f0e93.