Revert 0fb6e53..ffa8bc5

This rolls back to commit 0fb6e53ba8d18e0f462a77600be84050358fb458.