Revert 2835884..2d31a04

This rolls back to commit 2835884d8c84527f34436afd3130f1c299d1424a.