Try fixing 5.4 and 5.5 build, again