Revert 2b05e31..af0dd65

This rolls back to commit 2b05e311d706fd3b251cedfe46e4aaefd065c6af.