This implements https://github.com/singlebrook/rails_foundation/issues/16