Revert "take 2"

This reverts commit 9b5258093463a7fc268a65060e9a8b7f831ed993.
Revert "undo that, messing with netbeans/git"

This reverts commit 4765dcf314505cd1c33268a0ffc5d8f74c79327b.
undoing last two