More hackery.

More hackery.