Revert a6ab959..399ac11

This rolls back to commit a6ab95905a84b83df1e71778965fdb35cb011360.