Revert 6bf4ed1..c34b645

This rolls back to commit 6bf4ed1c8964f1848a76efbbd2eb8d4280387e61.