Revert 6ec8a45..8bd1767

This rolls back to commit 6ec8a4555c3adaece6386cbd38c74a2241abc692.