Revert "Reverted https://github.com/cappuccino/cappuccino/pull/2194"

This reverts commit 8db1267db9b15cb9dc2366e7114db63ca19a472b.