Revert 74241f6..6d9cbea

This rolls back to commit 74241f6a4f4f83b004ee702a963e45d7060c7b98.