Revert 60826af..1d7d0a7

This rolls back to commit 60826af307f884731c834aae2113bf7d5d759cc7.