Fix build for 5.4-alpha-3-SNAPSHOT