Revert 0eec957..6edca8d

This rolls back to commit 0eec9576941a94b45f4d51153842f5bccd050183.