This reverts commit ae09988e. Since commit id '71ce4759' has been reverted, this one is no longer necessary.