Revert d6ff2f1..820e96c

This rolls back to commit d6ff2f1a8baff9d687bc068bb3967768f4b9d9fb.