Revert 090fb06..cd640f0

This rolls back to commit 090fb06006a9c2cd26db20c25f8a4e543b4817c1.