Fixes for MOB-836 and MOB-766.

Note to reviewers: This setting does not seem to be used anymore.