Revert 600da24..74ca223

This rolls back to commit 600da2411c272eb7bbc1bce0c603789dbd33b06b.