[PATCH] Backout the ->device change from revision 4