This reverts commit f9ca0584.

which caused a regression:

http://bugzilla.kernel.org/show_bug.cgi?id=13620Signed-off-by: NLin Ming <ming.m.lin@intel.com>
Signed-off-by: NLen Brown <len.brown@intel.com>