Revert 477c1b8..73dc2b0

This rolls back to commit 477c1b8b292e2dc8f2f3439eb6b04212b685adca.