Revert old change it should be fixed in Havana