revert to 6.1.x-379