Revert 52a7de2..dba2d86

This rolls back to commit 52a7de24fb9dc46eb274eefbcb50337e60cdd788.