Revert "Merge branch 'q' into jb2"

This reverts commit 99d880d6fc41e38511734d92a91e653fe359f877, reversing
changes made to e6b5eba28139b1318e1090c9280cdf665135d348.

Conflicts:
	default.xml