Properly implement 62649776ca