Revert d20ba4d..2087814

This rolls back to commit d20ba4db930f38e53a599217e305e2e36e1d6203.