Revert 38af5ce..95856c7

This rolls back to commit 38af5cead0fe8ac5b2b8eca752fba5174d1b55a6.