Revert "Cleaned up some slot logic"

This reverts commit bd85a18d0bcdd3041357c846905c737f10732320.

Reason for revert: b/276759363

Change-Id: I3ba08cf4abeeb7769569512d50e7ff135438cf20
3 files changed