Revert "Last minute fix"

This reverts commit 6ea8b164bfc51abb89748e7401f15e0a325104a2.