Removed Astyanax hacks
We now depend on a build of Astyanax/master with
https://github.com/Netflix/astyanax/pull/472 applied