Revert d0fa466..d80d7ce

This rolls back to commit d0fa46669c6b9dc0f86eb91605d5c970b51c756e.
index