Revert a1a6b52..777c81b

This rolls back to commit a1a6b52ac979093bfcf361430eed9196568572e0.