Doh, forgot about 5.2 support AGAIN, refs #330