Revert dc23307..e8d9747

This rolls back to commit dc2330703dc9c4f5c1eaa562b79b83ae8c66c63c.