Revert 81d71f3..0e94385

This rolls back to commit 81d71f3b567287790e4da4247378cc93bd7dddb8.