Revert 0b8a7f3..b80051e

This rolls back to commit 0b8a7f3db57fcea620f4829241b9cc278d3567eb.