Revert 2c95887..5376573

This rolls back to commit 2c958874317327f95b9622e5b09a1b123ccc17dc.