Remove unnecessary responsibility features
Revert "Remove unnecessary responsibility features"

This reverts commit f4c3b1d5e220b5eb53e0b09e693b728039d18167.