Revert 8dd3909..de34af7

This rolls back to commit 8dd39094f1e10eebc687ec343d0a6df1e86173a0.