Summary: Forward-port the fix from 7u4 and also eliminate the grow box since we only support OS X 10.7+ that doesn't require it.
Reviewed-by: art, swingler