Revert 9391433..69c3b05

This rolls back to commit 93914335492c4bc7c7961f693d14b7a33e99786a.