Reverting #1163, the overhead is larger than I anticipated and regularly grabbing empty data sets causes some visual oddities