yap: revert update from 6.2.2 to 6.3.3

This reverts commit 41c662dcf68ce41c64ceb73a2f21a8aac09eb41e. The update
doesn't compile in i686, and I don't have time to investigate at the moment.