Revert 6f85dff..512f0d8

This rolls back to commit 6f85dfffe33bcbee942cebbbc232865388a1aaea.
dhbsk