Revert 68bc612..317795f

This rolls back to commit 68bc6126e7bcc3a675d3a19992dd5cb74d678025.