Revert c4feec6..5f6d57f

This rolls back to commit c4feec66ba9e898a28967bb2457a0ed271a5dadd.