Revert 2b43cfb..500d38d

This rolls back to commit 2b43cfba68e6b07cec6dcb8604d8b88c33b3fb62.