This reverts commit 30c7ef94ac. This was causing issues with bevel brushes in Q2 mode. Not sure why yet. Will attempt this again soonish.
30c7ef94ac