Revert cb9093b..d879dd8

This rolls back to commit cb9093b0a70a4feeb0f719cd37a5b631c9cfa5d3.