it became glaringly obvious that this was needed because of #4827 and #4868. this is further needed with the addition of cauldrons.