Revert "Catch up with CFX"

This reverts commit 05c8401b35ce60b5efdc9a2a954e20910f1887ec.