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