Revert a6a466f..90b09c3

This rolls back to commit a6a466fc3ad3bc2ec600cf3ab06a19434ad8ca2a.