Reverting mesh changes for now

Failing regression tests and no time to fix at the moment

This reverts commit a55dd612cc7816b25fe93c229f17bfd1b9db8342.
This reverts commit 5ffb6060bd8215263f3a8a212760ce87265dacee.