Undo blinepoint changes, they don't belong in this branch