Revert 379e4f0..c0f57fd

This rolls back to commit 379e4f03d2f600f0fdc8d58472c8866911299ae9.