This reverts commit 216690777e. Reverts #6622 Seems to be causing issues for other users, though. Will revert and we can try again with some tests in place.
216690777e