revert this little upgrade, it never worked out