Beta7 compatibility - the lazy way.