revert part of commit 6099f02d6a8e2d5ff88f2292675d5921861fd70b