Revert ba84cfd..4053443

This rolls back to commit ba84cfd16064e6f4ada66735e456eb57c916fe89.