Revert 59c875d..90ecb1a

This rolls back to commit 59c875d1f8e0a5a854be4b69cffb641da233288a.