Revert 9c5a67a..81a46c3

This rolls back to commit 9c5a67a4f22b7b00f13872b9ed86293f57e9ba1b.