Revert 741fda1..6d8701c

This rolls back to commit 741fda125012bc903644b859162d57452ba5d678.