Similarly 98ecbded, this provides better
error messages and faster installation times.

See #1473
See #1477