Can you please refactor this into sometihng that doesn't require `Object#tap`? Don't want to have to rely on ActiveSuppot mechanics.