Revert "split things compiles and fights"

(accidentally committed on the wrong branch)

This reverts commit 72c3bbb458a33659d3e51778c9b845eb3c94440e.