Revert 651b61a..3827744

This rolls back to commit 651b61afcb3727614498d13e0fa2284c9024f8ed.