Some things are worth doing once... methinks this was one of them.

Change-Id: I50cd0293e5faf70f79d85f30eb0cef0620ddb632