Revert 7e59056..31ebaf5

This rolls back to commit 7e59056e48e5b913f1e002525bca4079b0aabba9.