Revert 9e7fab9..8e4ea63

This rolls back to commit 9e7fab9ddbc86421d07881c4882da6eeeec32ff8.