rollback this change, it seems to have some unintended side effects