Revert 338693f..15ea345

This rolls back to commit 338693fbd13347b9f904a9647bfe1aa9f8347746.