Revert da2cdda..a500f1f

This rolls back to commit da2cdda52352b6e5d02cc4a439d4027a81ed2f15.