Revert 256bc02..341c563

This rolls back to commit 256bc025d764a1a322b6072e6d953822522b5d41.