This reverts commit 13314df21b, reversing changes made to 6e534c73c3.
13314df21b
6e534c73c3
#[optimize]