was obstacle deleted?
Revert "conflict issues"

This reverts commit cb5aced5d6de98dd458a0293d6dbed836510db70.
Revert "conflict?"

This reverts commit da1c078b6b0eada756ca1ac34bb80d05f37be8b3, reversing
changes made to 62e73e675378233f91c3f6c37c5942b93b0f1cd4.
trying to get latest copy