Revert c4c9f17..7a1ce72

This rolls back to commit c4c9f175fd89d7c980b86c5591dfb4ad24126b21.