This reverts commit 20c4aa13de. Wrong buggy commit breaking tests, and not actually adding anything to code quality.
20c4aa13de