Revert PR#417