Revert 3c2d80b..4ebad3b

This rolls back to commit 3c2d80b015e910b2c609e6f5aef890fa91fb9714.