Revert changes to observed handling in Distribution