Closes second half of issue #1611 that sumit & I talked about on phone.