Can't join node to cluster with less RAM than "cluster quota" even if not adding data service

I have a few nodes with the data service enabled with very large amounts of RAM and the "cluster quota" set high. When trying to add a node to the query service only, I am getting an error because it doesn't have enough RAM to match the cluster quota:
["Prepare join failed. This server does not have sufficient memory to support the cluster quota (Cluster Quota is 48402MB per node, this server only has 15068MB)!"]'

We need to make this restriction per-service and allow a node of any size to come into the query service, a node to come into the index service if it has at least the index RAM quota, and a node to come into the data service if it has at least the cluster RAM quota. Overlapping services will be a bit more tricky obviously.

This is critical to supporting our story of MDS...