Reverted that last behavior