Revert 72e069a..94725f4

This rolls back to commit 72e069a8dc0557df7e7815312373c39ba7d616db.