Revert back to before bendpoints implementation