Revert e7cc527..fc27a5f

This rolls back to commit e7cc5275976cfa70281c9014a7dac350e920fba7.