Revert "Updating Voxbox branch"

This reverts commit bf5b0f6293b23022c82dc0c2c3e9c718692b8519.