Revert 4b74f8a..35e500d

This rolls back to commit 4b74f8adad2768ba0b3a334fda22f38bd1c02253.