Revert "F1 conflict fix"

This reverts commit 5a9b43ca62b36d419c732123d0803bd1927c64ea, reversing
changes made to afb72b5619bef4cce22713976c8fdecdee5d96a0.
Revert "F2 add new change"

This reverts commit afb72b5619bef4cce22713976c8fdecdee5d96a0.
F1 fresh start
F1+F2 second merge