Revert 36388df..93e6162

This rolls back to commit 36388df88a128ebaad42ae2753445a6386c2e41b.