Work around bikeshed bugs again

Generated from:

commit 4106acb8a808f550c71423e63e0ea63384466a39
Author: Brian Birtles <birtles@gmail.com>
Date:   Thu Nov 27 13:21:53 2014 +0900

    Work around bikeshed bugs again