Revert 760b897..f316a19

This rolls back to commit 760b8976022cb27b741524ee503b15d9d0ff267e.