Revert f9c7c16..5544c86

This rolls back to commit f9c7c16469260fbb67a59ebfa30e5f4b78e011e8.