Putting feature back because it didn't fix unit tests on build server