Revert 2bb77a2..2434585

This rolls back to commit 2bb77a25c09ecc4b8afe3c3c825308b1efa44c8b.