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