Revert 7b7aa06..81577fd

This rolls back to commit 7b7aa0613c046776c987dc09e2fcd00fbd5f5971.