Revert 4339cf5..73dd8d2

This rolls back to commit 4339cf537af9cf1749af428686b6693009282178.