cherry-pick the changes from ccheever/bunny1 and remove misc garbage