The previous commit required the hash to be updated. Removed a bunch of redundant variables. Signed-off-by: Rosen Penev <rosenp@gmail.com>