Revert "Merge pull request #2239 from theanh0512/MAGN4078"

This reverts commit 0c4f1e75674f34d336cf13328d611391742c80e0, reversing
changes made to 80529a543b9c17c16daf663529012d9e1cc8de27.