Partial revert of cf1182e to fix profile edit