Yes this seems to work if you do not need to file 2555. Unfortunately, does not work if you do. Can't understand how PS could let a massive problem like this go unresolved for more than 1 day.
