Revert 49b1bac..341c563

This rolls back to commit 49b1bac63fed20163f0536cd6cfeab779945b07f.