Revert 1b7c58c..939139c

This rolls back to commit 1b7c58ca0f4d90844afe8369864a08e60a69e3ce.