De-sobekify the Tap
methods and remove panic
s
#1265
Merged
Tap
methods and remove panic
s
#1265