Revert 2ec3235..bd3ec2c

This rolls back to commit 2ec32358e98b54f8d3b3cb965846f6e977cdee26.