Revert 8a606ee..dacaa73

This rolls back to commit 8a606ee6c7e9518a176755d533523d1704fd8591.