Revert 33e8726..60e06be

This rolls back to commit 33e8726e281f5e6aab1d69b7ce3409711aa94cf4.