Buttons FC fix, take two

Change-Id: I6d6651aedd00e67bf050a4ad72a5496514791374