Revert "Pull faux123 fiops improvements"

This reverts commit 9aee36e908c8306e0ee5c3c95cd5ada7639b1532.
Unneded commit, already had the improvements :P