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