revert hacky fix redux