Revert "Stop using ActiveSupport::Concern"

This reverts commit 841ab3e5066e31fee63c808d51be7f69853d8362.