Revert "First supply handlers, then reorient"

This reverts commit 22f07a4b4f41350cda3bce985ab6e4af5ff5ebb5.