Revert a8f99d8..108b38c

This rolls back to commit a8f99d85346055dc4a07653bcfc31b281d67c85c.