Revert to old build task

This reverts commits d72b3a34381d750e4b5e497d69d1d891b3a1fcf7 and
3ff3bea.