Revert 00d977e..6103d65

This rolls back to commit 00d977e2e99480de843e5024d5d23c898071cc78.