Revert in this branch, moving to 4.4-1.7