Revert c1e9467..36a70a6

This rolls back to commit c1e946779a14f68c1a91798588970ee8a3d1236d.