Revert b8b9556..aca3573

This rolls back to commit b8b9556addd8f73048a3857dad87e3263a35538e.