Revert 73c84f6..7f86d88

This rolls back to commit 73c84f6191bb0b8ad6d1e77d1f56e319cce596fe.