Log Message: Revert previous. The fact that they don't pass is something to fix, not to avoid (although this is fixed in the soon-to-be-committed wrapper framework).