Revert 639ebea..3015866

This rolls back to commit 639ebeaf3083f1f23863d1c17af1427ffa8ed158.