Attempt 4 to fix e43 build.