Temporary fix build after pulling CMS-1269 without running tests first :-(