Revert 0251db4..8dc8f59

This rolls back to commit 0251db46d652f099533883abfad50aae7eea6d00.