Revert "Stop using ActiveSupport::Concern"

This reverts commit 7ccf4b684649bce48448ab5efa10f16b2a4254ea.