Revert "Stepped back uip"

This reverts commit 9b480f17d85acb743b0ad6e88cf64b8b62ef7823.