Revert 72e069a..3d529ff

This rolls back to commit 72e069a8dc0557df7e7815312373c39ba7d616db.