Revert "second defaults attempt"

This reverts commit 11aab15e586a1abf36d0f6d807b74ab064923a52.