Revert "Merge remote-tracking branch 'cappuccino/master'"

This reverts commit 00f61bfb14a06f1909b6fee6edd03d9068888919, reversing
changes made to 5f111464a03ceaf3f670bc1486bb9150c6cf292b.