Revert "default and master"

This reverts commit ebcda416a30ff9c7038b527e0c63fa238905eb32.