Partially reverted 3d83d23

Per https://github.com/Versal/versal-gadget-api/commit/3d83d2336c0b2be573bab02cee197c78dc26201e#commitcomment-7512674