Revert "build system consistent"
Revert "build system consistent"

This reverts commit b6188dce8baac96757097d40527687adbe898711.

insidegui/flux,nickbjohnson4224/rhombus,insidegui/flux,nickbjohnson4224/rhombus