Restore To Stock Layout

Change-Id: I7da445cc3c33164ea34296670259fbecc0ef44a4