Reverted the behavior until future hypothetical release