Revert e2d6a9c..618006d

This rolls back to commit e2d6a9c3097d005e416036f4cdd638b7d14b7557.