Revert 57a1f75..da2eb3e

This rolls back to commit 57a1f75bea23c24d91298c6934d00621794ce066.