Revert 96826e0..12dc1ed

This rolls back to commit 96826e0c17c64a1ac741b855d029b957b879b40d.