This reverts commit f109b10168 as required in f109b10168 (commitcomment-113477829).
f109b10168
f109b10168 (commitcomment-113477829)