Revert 59d9a26..02d5774

This rolls back to commit 59d9a26446ece0b344ce7ae08a69ea00af968ce2.