Revert "Add support for Cinder"

This reverts commit ba059ff719a65bfa69992d9408baa8420c70aae2.