Revert 16c3c96..b6cff4b

This rolls back to commit 16c3c96c6ef00971194656aa55e325ab03195d71.
vbbbv