Revert "Follow master"

This reverts commit e41825bbf7ceb028aed430593afe287185505f05.