This reverts commit 2cdcc2f7, reversing changes made to 380f9d09.
assigned to @balessan
merged
mentioned in commit 77b37872