Revert c6579cb..cfb57c9

This rolls back to commit c6579cbb06f1420f36cdb525ef17591da434dff7.