Just rerolling the patch. Have not applied the changes in #256