No fallback for Pre-0.9 back compatibility