Revert "merge from fyb"

This reverts commit 4f03edd6bfd8199938b28b3a7f7b28f929d15ce5.