Going back to the semi-working solution for now.