Undo hackery.
Fix Riak before trying to build.