Revert "update dev stuff" - this would break 1.7.9 compatibility!

This reverts commit 14b98d4982a54a9140b9484c3ab5a92baf3d933e.
Revert "v1.3.0.525 [Vault] - fix a NPE" still breaking

This reverts commit ff8600429276d88d32ed9b1a60d2567498e79061.