Revert 9bf8a54..eed41d6

This rolls back to commit 9bf8a5405b401567337aa813e9fad831130cf067.