Revert 2bce594..2b4ff64

This rolls back to commit 2bce594a8d7c2e44093da2af498a27db6ceaa1c5.