Sync up the -no-build version of form-master-details with the other