Revert 740f2e2..2bf5bd6

This rolls back to commit 740f2e2a9b72c19423e8d2d6fdf4a7dc365c16e0.