Revert 5a0b70e..e15d73a

This rolls back to commit 5a0b70efab3173f6ed9706008b02e20f5c10aec1.