Revert 087509c..dba0b35

This rolls back to commit 087509cffd1c1decab3e104fe161b151a7a845da.