Revert "Fix build" breaks 4g

This reverts commit 53c96a23ff1fd486f16f4fbf9f8c07851f2ac794.