Revert 09d06da..933b412

This rolls back to commit 09d06da613d76d8c66b32efff45e77587cc5c151.