Revert 7f4aa49..faa474c

This rolls back to commit 7f4aa498c00ae164ef7279e43d0f96d3b6382d68.