Revert dc66f4c..78a3f3f

This rolls back to commit dc66f4cd5e04d234abfe9b77c758b843ec9f2857.