Revert "Fixed Gates to work with barn"

This reverts commit 95ea6772051ecf9d98ffc47a43f055684a9948f3.