This reverts commit 86d7976349dd82a358593fad27821d32979c00b8, reversing changes made to caff368fd26a744a95dc8599d763422821478c73.