simplified #2117

I don't get why it was restricted to Request attributes..
Enables the same feature as #2117