Attempt 3 to fix e43 build.