Revert 11881bd..14c9408

This rolls back to commit 11881bddcf0b3017e05e2209c6919e94f6dabc41.