It looks like major modifications to the CFPA are on the table, including eliminating many of the most troubling elements, such as the "plain vanilla" proposal, the consumer comprehension tests, and the application to non-financial firms. Details here.