Revert "Inline that class"

This reverts commit d239d5385a019f14218801ef14c6d5d5dee83600.