Revert 15ca3ec..d173465

This rolls back to commit 15ca3ec1898c46a567067b7d4fa2f60b14f1f7c4.