Revert "move a lot of observance logic into ObservanceDecorator"

This reverts commit fd24eee569de51c95ca6563070dbdbea46e6a4a9.