Revert "bug #258"