Revert 8439dd4..c8173b7

This rolls back to commit 8439dd460cade9cc98c834d29f2db654ac5ab346.