Experimental removal of WhenPresentDecorator.