Sorry, did not pan out.  Back out four commits.