This should be moved back to the original location.
Restore .if make(universe) location
Looks fine to me...
Committed in rS282156 but did not auto-close