revert to old solution