Reverted Charlie's test commit