Attempt 2 to fix e43 build.