Revert 4883261..bdeacb0

This rolls back to commit 4883261e6a504f2706c54707a7fde56e59119399.