Revert 6d19c10..56f1505

This rolls back to commit 6d19c108ac65a19786746d4f449bba6c06b70c24.