Assigning this to as an easy cherry pick off the bug list.