Revert DEVELOP changes

This reverts commit 703c47eda6de8d2b6683fea24bfbe8bfadb23665.
This reverts commit 997ace8daad04592b8c85fda1106647652de66c5.
Note about vagrant support