Revert "fix sync errors, damn you github!!!"

This reverts commit 4c880b9a36eaa788820fef29ca5ec7e1aac27986.

Conflicts:
	default.xml
Revert "Temporary fix.  Thanks to @rascarlo for pointing this out"

This reverts commit cff5cde0edbaf32c59accd09193fa51b690ce7b4.

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	default.xml