PLain-ify #2

Change-Id: Ic1a2987b2630d0d0704ee5703bea9a7fda085fff