Revert 8d8b02b..931a446

This rolls back to commit 8d8b02befedb745d31010e29c4ddb6cb40344518.