Update to previous commit. TODO: Fix error with topic validation