Merge commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1' * commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1': Remove old glue code.
Merge commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1' * commit '7417ae9354e10971c0b5d41dc9194fab17b80ea1': Remove old glue code.