Revert aec47a1..38085fb

This rolls back to commit aec47a1e3f2547719b9eba91f73efd0d1e22c026.