Revert 8da2e39..06cd41b

This rolls back to commit 8da2e39fd76745181dd0ea341df511322f2ecb11.