Revert "v0.6.0.5.5_QUICK_FIX"

This reverts commit 0929ba8039e4824c6176216224e86ec530843995.