Rollbacks df5e4a21e592846bdcfedf1c9bf315ee75a8b107 (see #2)