Revert slight optimisations, they appear to have broken linear_extrude.

This reverts commit d264bbe96525f3849a2b1f3fa7fd000747a0b0c7
and commit d9846759b2f0ee435456b7c3d88bf7fe59c9d879