Revert "Remodify build"

This reverts commit d5972a3249d694b134010020e086f4d88656c8a6.