Fix compile error due to depending on #7267