D'oh, wrong branch!

This rolls back to commit 7015d3b96ab63127bbcc45c7bf8caffd72c13422.