Revert 352620e..0c97ca2

This rolls back to commit 352620eb78ec9411c1e87f60d84de08d4e36f801.