Back out changeset 9bd21ab86f78 (bug 1013160) due to regression (bug 1017335).