Merge "Remove old glue code." into gingerbread