Rollback now useless fix for SWF-2385