Going back on a previous fix so that connector remains the same. Will
reimplement fixes once confirmation is given.