Bug 949458 - Follow-up including API version check. r=me