Reverts #302