This branch seemed to be dead code. Reviewer, please double-check.