Revert 76b3ef3..2b35d86

This rolls back to commit 76b3ef3c276bd1d06b68a2a1810cbe4252a8d335.