Move into non-experimental kernel branch.

The -merge branch has proven stable. Temp hack was removed permanently.