Revert "Stop using ActiveSupport::Concern"

This reverts commit 756191d7c4f0467c634812fc38651c5712c8e75a.