Revert 08c585a..378335e

This rolls back to commit 08c585a7a218ae119de9d2184c874d89405c8d5d.