Revert "Sub tree merged in carmel"

This reverts commit aa380807836baaafc9e30836b449967df1c3bb21, reversing
changes made to de5ff0980e6d67c20675d2af61bffbee2289cb43.