Revert bb5af02..a59ff0d

This rolls back to commit bb5af0286d6686847c55e02677ac41497dae82a8.