This reverts commit f383a05d. Sorry, I committed this patch by mistake. See reviewboard for explanations.