Revert c3a1641..319d22b

This rolls back to commit c3a164189b2be202b298724cddbdadb20f18639d.