Revert a102adf..52b7dc3

This rolls back to commit a102adf566625db7f93760f9a545d5721e246818.
Revert 4f60884..eaeee39

This rolls back to commit 4f6088469a836e91e0a4fa0ba828bdcf7243a25f.
Revert 52b7dc3..f58b6d4

This rolls back to commit 52b7dc32febc18722f05b842dcda5b81e1924aa4.
make functional test reliable

fix bug