Revert 5df3e5a..51a8353

This rolls back to commit 5df3e5a0865dd440522cac33ec2f2456cdf57b3a.