Revert "Merge branch 'units' into 'master'

This reverts commit baf3a7b8, reversing
changes made to 8ce837d0.
5 jobs for master in 30 minutes and 47 seconds (queued for 42 minutes and 43 seconds)
Status Job ID Name Coverage
  Test
passed #151944
test_min

00:01:29

passed #151945
test_mpi

00:06:12

passed #151946
test_mpi_fftw

00:06:34

passed #151947
test_mpi_fftw_hdf5

00:07:37

32.0%
 
  Release
passed #151948
release_image_master

00:08:53