Feature/revert to defaults

Please don't manually merge—testing Jenkins GitHub pull request builder.