Revert "Merge branch 'alexeagle'"

This reverts commit 8b8386eed6429cb03d71d670baf546412bfdc808, reversing
changes made to 71c8962d0af6562de730d5e96f4e88d4959f860e.