This reverts commit 464dcab8. Going to fix forward size regression instead due to more dependent patches needing to be reverted otherwise.