Duplicate of preceding patch from priapushk@gmail.com