Reverted all CAF changes as they were not actually being built