Revert 0db13af..add386d

This rolls back to commit 0db13af8fe42f527d47d11bed1ceedd6576c157b.