Hendrik Leppkes:
	- Properly replace the store button with the help button if the store is disabled
	This matches default UI behavior.
	- Remove pre-6.1 compat code
