Merge branch 'revert-a4baf4e4' into 'master'

Revert "Merge branch 'staticman_67d5d070-05eb-11e9-9ad6-fde12250687e' into 'master'"

See merge request !2
2 jobs for master in 13 seconds (queued for 2 seconds)
Status Job ID Name Coverage
  Test
passed #292473
pages

00:00:13

 
  Deploy
passed pages:deploy

00:00:00