Revert bbc6706..b1aa7e0

This rolls back to commit bbc6706c0700ce5ce892614324b0f9e47680eabb.
...