Revert 08a4619..82c77f8

This rolls back to commit 08a46195fedeeb598d1425d3f462dfc09142e9c6.
rgf