revert most of previous patch

1 job for master in 1 minute and 12 seconds (queued for 1 second)
Status Job ID Name Coverage
  Build
passed #14742
compile

00:01:12