Revert commit e67c5f6