Returned on master branch for hammerhead