This reverts commit 822f480922fe2a0a38bc9de429cb2457b2eda96f. See here for more discussion: 822f480922
822f480922