Revert for now having error during build

This reverts commit a91a077d35b3b01d7da3d43b88a5aa29f6466ab4.