dropping in fw 3.5.4