Revert back to ceaf401638b2861881d843c08d7800c03bc22e7b
Merge branch 'tmp-ctree'