Accidentally merged topic instead of just running tests...
This reverts commit 19d37821, reversing changes made to a07ee519.