Revert "resync upstream on Sun May 11 13:10:43 EEST 2014"

This reverts commit f847db45e505be5d1dfceaea98b27d36a9e05e6f.