fixes #2419 - renewed discussion in #2112 suggests removal of the option was primarily aimed at non-Android builds