This reverts commit a53cd03d. This commit is exposing some implementation gaps in other patterns. Reverting for now.