Revert to backwards-compatible test