DO NOT MERGE - FOR INTERNAL CODE REVIEW ONLY

First it is 2009, now it's 2011. At least we're moving forward!