Begin transition to new way of handling defaults