Revert "Develop"

Reverts irpanGinanjar/TUBES-IFG-1127050077-1127050153#5