fix and revert commit 95422c2e