Revert 40863c8..eed4b61

This rolls back to commit 40863c88164d2ffe8c56fea9445ff602cc646e29.