Removed dependence on support library.