Revert board clean-up

This reverts commit 133d902cddb50463d8033c40c6cffde3bd297076.