reverted previous patch because of potential errors