Revert c87d4dd..d7764c7

This rolls back to commit c87d4ddc0992f97de798215dd5eda05baccce1f8.