Revert 9687333..1bca2be

This rolls back to commit 96873333e1b9da866e20f0b581fb0e50a2e720a5.