Revert 8f5cf67..eb109b8

This rolls back to commit 8f5cf67accccf76eb93fbf8e870138c95506c12c.