This could also be reverted, as you don't end up using it directly.