Give up the 4.0, use the original workaround