Revert fdb4d38..a155ac6

This rolls back to commit fdb4d38e6ada45a531ef39482cbf46a7341d25b6.