Revert a2fb5a6..24218c6

This rolls back to commit a2fb5a63aeaea693156760b82acd1905bfd1948d.