Revert "Temp commit to create other branch first locally"

This reverts commit 445176d7aea0fa35b311c39f68d8d0ad466d2dce.
Reapply changes for this branch but leave the new handler unchanged.