tweak
Revert "Reverting disposition optimization for a quick test"

This reverts commit 13e12807f7c78cabf46cfa13f2a0a878bfcf92fb.