Reverting the revert. CF build is now failing