Revert "Temporary deployment of master to production."

This reverts commit 1ccb8910348be675c956680522d130e195003f8f, since
we've properly merged in recent changes to the Cavia branch.