Revert 2c86683..435e4f6

This rolls back to commit 2c86683a9e2b794ac0006e6262cc3acb18ad5310.