Revert 003e987..2dd4fd1

This rolls back to commit 003e9870816b79ae092f635234861b88123984fe.
Roll back

Think I screwed something up with commits, going back to original
version.