Netbeans broke something during merge, revert that